In
`@apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java`:
- Around line 1398-1409: The current heuristic using startsWith("{"/"[") causes
legitimate String values like "{hello}" to be double-encoded via
mapper.writeValueAsString; update the loop that builds formValue (iterating
jsonMap entries) to treat any instance of String as a raw value (formValue =
(String) value) and only call mapper.writeValueAsString for non-String types
(e.g., List, Map, arrays, POJOs), removing the startsWith checks so strings are
never serialized.

In
`@apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java`:
- Around line 1414-1418: The code logs and reports full form data (see
AdminTestUtil using logger.info("Form data: " + formData.toString()) and
GlobalMethods.reportRequest(..., formData.toString(), ...)) which can leak
sensitive values; change this to either mask sensitive fields (e.g., password,
otp, token) before logging/reporting or gate the logging behind a debug flag so
only non-production debug builds emit the full payload; update the logging lines
and the argument passed to GlobalMethods.reportRequest and keep the actual call
to RestClient.postRequestWithFormDataBody(url, formData) unchanged.

In
`@apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java`:
- Around line 1398-1412: In AdminTestUtil where jsonMap is converted to formData
(the loop that reads jsonMap entries and calls mapper.writeValueAsString), add a
null check for entry.getValue() before serializing: if value is null either skip
calling mapper.writeValueAsString and omit the key from formData or map it to an
empty string (e.g., formValue = "") instead of allowing
mapper.writeValueAsString(null) which yields the literal "null"; ensure the code
updates formData.put(entry.getKey(), formValue) accordingly and references the
same jsonMap/mapper/formData variables to locate the change.